Tegra: bpmp: return error if BPMP init fails

This patch returns error if BPMP initialization fails. The platform
code marks the cluster as "runnning" since we wont be able to get
it into the low power state without BPMP.

Change-Id: I86f51d478626240bb7b4ccede8907674290c5dc1
Signed-off-by: Varun Wadekar <[email protected]>

diff --git a/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c b/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
index 1867511cb51251ac6602bef2089d6970aaf76a6a..1c5d2e159a354a26375ac0f240ef8579e9ed5caa 100644 (file)
--- a/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
+++ b/plat/nvidia/tegra/common/drivers/bpmp/bpmp.c
@@ -125,7 +125,7 @@ int tegra_bpmp_init(void)
                val = mmio_read_32(TEGRA_RES_SEMA_BASE + STA_OFFSET);
                if (val != SIGN_OF_LIFE) {
                        ERROR("BPMP precessor not available\n");
-                       ret = -ENOTSUP;
+                       return -ENOTSUP;
                }
 
                /* check if clock for the atomics block is enabled */
@@ -158,8 +158,7 @@ int tegra_bpmp_init(void)
                }
 
                /* mark state as "initialized" */
-               if (ret == 0)
-                       bpmp_init_state = BPMP_INIT_COMPLETE;
+               bpmp_init_state = BPMP_INIT_COMPLETE;
 
                /* the channel values have to be visible across all cpus */
                flush_dcache_range((uint64_t)channel_base, sizeof(channel_base));

diff --git a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
index 958aa9256f4e07abcc71f7e878a3eb5d1d922951..f52d975d833534c8d12f7ee41acd7a0f4fd214a6 100644 (file)
--- a/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
+++ b/plat/nvidia/tegra/soc/t210/plat_psci_handlers.c
@@ -104,41 +104,55 @@ plat_local_state_t tegra_soc_get_target_pwr_state(unsigned int lvl,
        if ((lvl == MPIDR_AFFLVL1) && (target == PSTATE_ID_CLUSTER_IDLE)) {
 
                /* initialize the bpmp interface */
-               (void)tegra_bpmp_init();
-
-               /* Cluster idle */
-               data[0] = (uint32_t)cpu;
-               data[1] = TEGRA_PM_CC6;
-               data[2] = TEGRA_PM_SC1;
-               ret = tegra_bpmp_send_receive_atomic(MRQ_DO_IDLE,
-                               (void *)&data, (int)sizeof(data),
-                               (void *)&bpmp_reply, (int)sizeof(bpmp_reply));
-
-               /* check if cluster idle entry is allowed */
-               if ((ret != 0L) || (bpmp_reply != BPMP_CCx_ALLOWED)) {
+               ret = tegra_bpmp_init();
+               if (ret != 0U) {
 
                        /* Cluster idle not allowed */
                        target = PSCI_LOCAL_STATE_RUN;
+               } else {
+
+                       /* Cluster idle */
+                       data[0] = (uint32_t)cpu;
+                       data[1] = TEGRA_PM_CC6;
+                       data[2] = TEGRA_PM_SC1;
+                       ret = tegra_bpmp_send_receive_atomic(MRQ_DO_IDLE,
+                                       (void *)&data, (int)sizeof(data),
+                                       (void *)&bpmp_reply,
+                                       (int)sizeof(bpmp_reply));
+
+                       /* check if cluster idle entry is allowed */
+                       if ((ret != 0L) || (bpmp_reply != BPMP_CCx_ALLOWED)) {
+
+                               /* Cluster idle not allowed */
+                               target = PSCI_LOCAL_STATE_RUN;
+                       }
                }
 
        } else if ((lvl == MPIDR_AFFLVL1) && (target == PSTATE_ID_CLUSTER_POWERDN)) {
 
                /* initialize the bpmp interface */
-               (void)tegra_bpmp_init();
-
-               /* Cluster power-down */
-               data[0] = (uint32_t)cpu;
-               data[1] = TEGRA_PM_CC7;
-               data[2] = TEGRA_PM_SC1;
-               ret = tegra_bpmp_send_receive_atomic(MRQ_DO_IDLE,
-                               (void *)&data, (int)sizeof(data),
-                               (void *)&bpmp_reply, (int)sizeof(bpmp_reply));
-
-               /* check if cluster power down is allowed */
-               if ((ret != 0L) || (bpmp_reply != BPMP_CCx_ALLOWED)) {
+               ret = tegra_bpmp_init();
+               if (ret != 0U) {
 
                        /* Cluster power down not allowed */
                        target = PSCI_LOCAL_STATE_RUN;
+               } else {
+
+                       /* Cluster power-down */
+                       data[0] = (uint32_t)cpu;
+                       data[1] = TEGRA_PM_CC7;
+                       data[2] = TEGRA_PM_SC1;
+                       ret = tegra_bpmp_send_receive_atomic(MRQ_DO_IDLE,
+                                       (void *)&data, (int)sizeof(data),
+                                       (void *)&bpmp_reply,
+                                       (int)sizeof(bpmp_reply));
+
+                       /* check if cluster power down is allowed */
+                       if ((ret != 0L) || (bpmp_reply != BPMP_CCx_ALLOWED)) {
+
+                               /* Cluster power down not allowed */
+                               target = PSCI_LOCAL_STATE_RUN;
+                       }
                }
 
        } else if (((lvl == MPIDR_AFFLVL2) || (lvl == MPIDR_AFFLVL1)) &&